Merge Karim's changes with Joe's into dev branch

You can see end results of this pull request here: http://joechan.us/vh