stuff
Merge pull request #38 from ospreys-2014/user_branch

stuff