Small comments or whatever
Merge pull request #8 from TehShrike/2014-09-30

Small comments or whatever