get it working
Merge pull request #1 from ivanoats/master

get it working