Issue #12
Merge branch 'master' into iss3