squashed all commits
Merge pull request #1 from alex-zen/master

test