Updated to current version

Fixed issue 29 and typo