Upadated for issue 5, version bumped