merged
Merge pull request #28 from paulbalogh/master

merged