More patches to follow v1.0.1.
Merge pull request #73 from funnylookinhat/develop

v1.0.1b - More patches to follow and fix v1.0.1.