Fixes #1 Fixes #2 Fixes #3 Fixes #4 Fixes #5
Fixes #1 Fixes #2 Fixes #3 Fixes #4 Fixes #5
Fixes #6
Merge pull request #14 from ChristianMurphy/bwunger_rnikbakh

Bwunger rnikbakh bug fixes