Merge pull request #3 from oheric/master

Master