Merge pull request #62 from krono/master