Minor fixes...
Merge pull request #16 from kojoman/dev

Minor fixes...