Bug fixes and Improvements
Merge branch 'master' of https://github.com/drberry85/SFrameTools