2013-06-13: cleansing 1 for initial release 0.2
Merge branch 'master' into integration