Merge pull request #1 from simolayton/master

pull