Merge pull request #1 from AliMD/master

Pull!
Merge pull request #19 from Mrshcom/master

fix old master