Erik wants to play
Erik wants to play too
Merge pull request #36 from tistatos/dev

Merging tistatos pull request into dev