Merge pull request #15 from mjtorn/master