Fixed image resizing. Closes #15
CS fixes
Merge branch 'master' into feature/refactor-linksets