Merge pull request #3 from hsym/master

Master