Merge pull request #7 from kelvinikome/master

Bug fixes