New and improved
Merge pull request #10 from vnmnd/master

New and improved