Merge pull request #10 from iantocristian/master

a couple more bug fixes
Merge remote-tracking branch 'aam/master'