various additions and fixes
various additions and fixes
various additions and fixes
cleanup
Merge pull request #1 from MAD-GooZe/master

interface changes