Bugs
Merge pull request #14 from nf1213/master

Bugs