Closes #54 (res loading bug)
Merge remote-tracking branch 'origin/master'