Merge pull request #10 from Arctium/master

standard pull request