Merge pull request #7 from zagadooga/alec

Alec
Merge branch 'master' into alec