Merge branch 'develop'
2013-05-15 1237: updated the docs for v0.2.1