Merge pull request #117 from AoD314/master

fix master