1st commit
I was here
Merge pull request #16 from LintuSotaRauha/master

Please merge
Merge pull request #15 from queenfrankie/master

hella good code aus berlin
Bringing in John's latest bug fixes