0.5.1
merged with master