filname corrected
post 0.6 changes
pre-0.6 stage
version 0.6
Merge branch 'develop'