branch 5
Just some cleanup work DRY...
Merge pull request #5 from eightamrock/br5

branch 5
Merge pull request #30 from eightamrock/master

LaunchBox Release - Dec 12, 2014 10:07:09 EST