updated to famous 0.3.1
merge from master: famous update to 0.3.1
added some comments and code folding for presentation