Revert "Issue 36"

Wrong merge - should be dev branch