Code Formatting and Fixes Bug #6

**It seems that the original repository is dead, so I've made the pull request against your fork.**