Solves issues #3 and #8.