Added final changes for 0.1.1