Closes #59
-Hopefully it doesn't cause any side-effects like friagram predicted...