#15 fix
#16 fix
Merge branch 'iss16'