Completing #8 and #9
Version bump