Good enough for 0.0.1
Better sample for 0.0.1
Merge branch 'develop'