Cleaned code and prepare for release
Updated changelog