up and running
Merge pull request #43 from pisi79/master

up and running