Dev master 1.1

Latest Changes with resolved issues.