Merge pull request #2 from statusbits/master

Pulled latest updates from statusbits