Fixed Makefile again and mode changes
Merge branch 'develop' of https://github.com/lilveg/OSGARD into develop