this should fix #2 ... i hope i made no mistake ...
Merge branch 'master' of https://github.com/SIS-Team/SIS