Fixes Issue 17
Fixed merge conflicts