my message
ipdate
Merge pull request #1 from buren/b1

B1
Fixed merge conflicts