Small updates
Merge pull request #1 from doubledead/Dev

Small updates