I AM A BAD MAN :(
Merge pull request #4 from mglinski/develop

I AM A BAD MAN :(  [Yes you are. -ed]