Revert pull req #36, #37, #38
Merge branch 'revert'