Added changes proposed by @mgajda and bumped version number

Closes #18