Really fixed issue #7
Merge branch 'c1moore_branch' into dev