Merge pull request #3 from statusbits/master

Pulled latest updates from statusbits