Merging changes from master to 0.1