Merge pull request #24 from janm399/master

One-zero