#57
#50
#60, #39
#61
#64, #63
#50, #60
Merge pull request #7 from NorthBridge/master

Demo prep