Merge pull request #48 from psichi/master

erhm..