Update Sources

Bugfixes and moved to newer version