Fix #99 and partially fix #103

Okay. Than you'll have to sync your fork with this repo. https://help.github.com/articles/syncing-a-fork