Closes #2, thanks @lowks