Fixed Issue #10 and Issue #12
Minor changes
Merge pull request #14 from iniqua/issue10and12

Issue10and12