#3 initial
fixes #3 #4
Merge branch 'issue-3'