Merge pull request #9 from Lich2013/dev

Dev