Fancy Update, Code Cleanup and Refractoring
Merge pull request #1 from BjoernAkAManf/master

Fancy Update, Code Cleanup and Refractoring