bug fix
Merge pull request #17 from JoeDou/joeDev

bug fix