branch 10
Merge pull request #10 from eightamrock/br10

branch 10
Merge pull request #33 from eightamrock/master

LaunchBox Release - Dec 14, 2014 18:10:08 EST