Changes tested with the ORCA interface
Merge pull request #14 from cjones2500/master

ORCA approved code