Merge pull request #6 from Lich2013/dev

Dev
Merge pull request #7 from Lich2013/dev

Dev
Merge pull request #8 from Lich2013/master

fix conflict