branch 6
Merge pull request #6 from eightamrock/br6

branch 6
Merge pull request #31 from eightamrock/master

LaunchBox Release - Dec 13, 2014 00:15:59 EST