Merge branch 'master' into develop
Version bump to 0.3.14
fixed #12
rollback changes in DESCRIPTION
better catching of conditions
git functions more reliable and reusable
Merge branch 'release-0.3.14'