closes #131 #132