Merge pull request #57 from Xerkus/master