*/ CHANGED Bugfixes and tests done. Still need to work on implementing other features from the master branch.