Edit/Bugfixing v.1.0.3