Merge pull request #1 from Xerkus/master

a bit of cleanup