Merge pull request 71 from dev/104-105-code-cleanup into develop

This commit is contained in:
Peter Honeder
2015-07-17 00:07:03 +00:00