Merge pull request #112 from janm399/master

One seven