misc updates
Merge pull request #48 from reekoheek/master

misc updates