various updates
Merge pull request #175 from dildick/master

various updates