Fixes for [issue 14]