half-done...1 bug
Merge branch 'master' into submission/heartthrob