Image asset fixes
Merge pull request #28 from jcreedon/dev

Image asset fixes