fixes #4
Merge branch 'chris'