Merge pull request #18 from rerobins/rerobins_dev

Merging in development fixes into master.
Merge pull request #19 from rerobins/rerobins_dev

Pulling in feature increases
Merging in the last of the changes from the old work area.