Merge pull request #6 from anderslm/master

Bugfixing and initial example. Anders, Anders, Über alles