Merge pull request #17 from mjtorn/master