Merge pull request #7 from owen-d/master

merged latest changes from double-Upstream
fixed launch bugs
fixes #10
Merge pull request #14 from sunny-g/master

small fix
test suite working
specs passing