Update master to reflect new changes. #40
Description
Master has not been updated in more than a month, and a significant amount of changes are not reflected in master anymore. As soon as features that are in progress are completed, and current bugs have been patched, master should be updated to reflect the current state of the project.