Adds #9 and Fixes #13