bug fixes
Merge pull request #4 from lordjone/master

merge with lordjone/master