various
Merge pull request #14 from jankroken/dev

various changes