Initial updates
Merge pull request #1 from bitwhacker/master

Initial updates