Dev branch commit
Merge pull request #1 from nybble33/dev

Merging dev Dev branch commit