Resolved #5
Merge branch 'no-origin-bugfix' into develop