Merge Development into master

The actual library has been overhauled and is ready to go visit master.