This will fix issue 20
DO NOT MERGE this for now. we need to merge the other two PRs that are open first
LGTM :thumbsup:
rebased onto 8174c2d4021e1c2dd25d259dd15c738e5af394d6
rebased on top of latest master.. merging now
Pull-Request has been merged by dustymabe
This will fix issue 20