First commit to fix issue 1