trying to make it work
Merge branch 'master' of https://github.com/livhs/ISCOL
Merge pull request #1 from livhs/master

trying to combine livhs' forked version with nuritme's version