Iss5 completed

Issue #5 completed. Ready to merge into master branch