Merge pull request #2 from Lich2013/dev

Dev
branch
conflict fixded