Revert changes from branch #17 and #18