patch code
Merge pull request #161 from betashepherd/master

patch code