Merge pull request #7 from hkorte/master

Fix failing test and example code