Fix #84

Ran git rebase to merge previous commits. 
Cleaned up whitespace.
Smaller image for faster load time.