final tweaks
Merge pull request #119 from mikeemoo/master

final tweaks