It works, now we tweak and tune
Merge pull request #20 from drozer/master

It works, now we tweak and tune