Merge pull request #223 from Ericson2314/master

Fix #222