Just making it work
Class? Where?
Merge pull request #2 from kelvinst/making-it-work

Making it work