Merge pull request #3 from rhukster/master

General improvements + fixes
Release v1.0.4

Optimizations.