Merged development (Version 1.0)