Haimer's branch
Merge pull request #2 from lbond/HaimersBranch

Haimer's branch