Fix second issue from #42

[trevorstephens]

Fixes #42
Fixes #50

[coveralls]

Coverage increased (+0.002%) to 99.233% when pulling 1b2848c on fix-second-issue-from-#42 into 68c50b4 on master.

[coveralls]

Coverage increased (+0.002%) to 99.233% when pulling a93cba9 on fix-second-issue-from-#42 into 68c50b4 on master.

[coveralls]

Coverage increased (+0.007%) to 99.238% when pulling 07bbef9 on fix-second-issue-from-#42 into 68c50b4 on master.

[coveralls]

Coverage increased (+0.002%) to 99.233% when pulling f8d143e on fix-second-issue-from-#42 into 68c50b4 on master.

[coveralls]

Coverage increased (+0.002%) to 99.233% when pulling d2e0921 on fix-second-issue-from-#42 into 68c50b4 on master.

[coveralls]

Coverage increased (+0.002%) to 99.233% when pulling 704fd3c on fix-second-issue-from-#42 into 68c50b4 on master.