Updated a bit more, working mainly on integration and seeing what else needs to be changed at the moment. (Bug #12)
Fixed merge conflict with issue-12. (Bug #31)