Merge testBranch into master

This should fix #1