Iss13 into master

Issue #13 is now solved and ready for a merge into master.