Simpsons++
Merge pull request #27 from michalbe/master

Update