Closes #165 (I'll be online later, busy atm, but this was easy to do)