Merge pull request #7 from kbsx32/master

Pull request from night 19.09.2014