Version 0.03 unwanted stuff causing issue, probably refactoring left over stuff
Merge branch 'version0.03'