Merge pull request #74 from Mattsface/master

Updated carrier wave branch
push to master