Merge pull request #10 from celldee/master

Some more edits