Merge pull request #18 from Xerkus/master