Merging from master to 0.1