3rd commit
Merge pull request #2 from meonkeys/stuff

3rd commit, ok?