Issue 23

Please review for potential merge with master branch.