Issue #46
Issue #47
Merge branch 'new-features'