Merge pull request #13 from jonavargas/Bryan

Merge pull request #11 from jonavargas/master
Merge branch 'master' of https://github.com/jonavargas/ISW
Merge pull request #14 from jonavargas/master

ok