merge
merged
Merge pull request #40 from ridoo/master

fix merge issues