Fix for issue-12
Merge branch 'develop' of github.com:MOPCON/MOPCON into develop