Fixed issue #7 - Moved code to more logical place.
Merge branch 'issue-7' into develop