Merge pull request #9 from Lich2013/dev

Dev
Merge pull request #10 from Lich2013/master

Merge pull request #9 from Lich2013/dev