Adding WIP of issue3
test merge
Merge pull request #14 from kleinlieu/testMerge

Test merge