Merge Iss27

Issue 27 resolved. Merging together.