closing #62
Merge branch 'issue-62' into develop
keeping up