Merge pull request #1 from furgalep/master