fix bug 001
merged bug fix 001
fast forward
Merge branch 'issue-001'
.gitignore
ignore
ig2
ignore
merge ignore