Fixed #13
Fixed #14
Merge pull request #3 from nicklondhe/master

Bug Fixes