Update to latest Version 0.3.6