Fix21

This pull request has a commit that fixes #21. Merge only  after merging the commits from July 01 and July 04.