Merge pull request #5 - #10