Merged changes from master 0.3.0