Finalized Version 0.6.1