Commit 0c74b5a4c29cfbe3b7ebc091929ebe49c0d8eee2

William Pitcock 2016-11-04T23:32:50

Merge branch 'kyua' (closes #96)