Mass commit
Merge pull request #126 from blind-squirrel/alex

Mass commit