Last commit to development, current version is now merged back into master