Some Bug fixes
Merge branch 'develop' of github.com:ndomar/megasoft-14 into bugfix
Merge pull request #407 from ndomar/bugfix

Bugfixes