Fixes #154 (closed) #153 (closed) #102 (closed) #137 (closed) #144 (closed)
This will create a new commit in order to revert the existing changes.
