Merge branch 'issue-4'
-is3 changes after is3
-cliflitcst with squash removed
-issue 3 conflicts removed
-coflicts resolved before rebase