it all works
Merge pull request #22 from fiery-skippers-2014/done

it all works