fixes for [issue #13]