Merging changes for 0.1.1 release
Increased version number