working now
Merge pull request #1 from lostinplace/master

I need to stop tweaking this now that it works