Merge PR #28 into dev
branch instead of develop
branch
#34
+1,695
−71
dev
branch instead of develop
branch
#34