Some cleaning
Merge pull request #15 from Yukariin/master

Some cleaning