Merge branch 'jnosky/master'