Merge pull request #8 from rnentjes/master

Some changes
Where are my walls?