Merge pull requests #3, #9, #10