ready to merge into master, change version number 0.21
Merge branch 'issue14'