Merge pull request #56 from psichi/master

Erhm..