Merge pull request #4 from yangacer/master