working hack
Merge pull request #1 from Tomdye/master

working hack