Iss45

Issue #45 completed. Pulling branch Iss45 into master.