Merge pull request #61 from krono/master