commit
merge
fixing #1