One more attempt
Finally working?
Merge pull request #3 from kapitano/master

One more attempt, ok?