Merge pull request #31 from Wohlhabend-Networks/master

Repo Sync
Merge pull request #132 from Wohlhabend-Networks/valtteri

Merge pull request #31 from Wohlhabend-Networks/master