Merge pull request #17 from Thinkscape/master