Merge 31 master

closes #31 #32