Merge pull request #63 from krono/master