Fixes issue #15
Fixes issue #16
Merge pull request #17 from kidGodzilla/master

Fixes issue #15 & issue #16