Merge pull request #24 from JeffBlodgett/BusinessLogicFineTuning

Business logic fine tuning