Merge pull request #22 from flubbes/update-1

merge update-1 into jony
Merge pull request #27 from flubbes/update-1

merge update-1 into jony
Merge pull request #37 from flubbes/jony

merge jony into update-1