Merge pull request #1 from joola/develop

Initial merge of base repo content
More progress with the example package
merge conflicts
Merge pull request #2 from joola/master

Master