This should address issues 48 and 120

This should fix #48 and fix #120