Fix Bug
Merge pull request #25 from wilsonodk/bug-fixes

Fix Bug