v1.1.6: Merge pull request #20 from czf/feature-more-pt2

CrustyJew
2016-10-28T14:43:27Z

Merge pull request CrustyJew#20 from czf/feature-more-pt2

More comments