Merge develop, Version 1.1