Fixes #7
Fixes #12
Updated README
Updated changelog and features