Merge pull request #14 from mjtorn/master