production ready
Merge pull request #8 from sgnl/master

production ready