started work on new feature
merge down
merge down
Merge pull request #3 from birdbum/fdewaghe-hotfix1

merge down
merged new feature with hotfix
Merge pull request #5 from birdbum/dev

Dev