gb:
Merge pull request #27 from pisi79/master

gb