Final push
Merge pull request #19 from fiery-skippers-2014/use-this-branch

Final push