Merge pull request #1 from conceptuli/master

pull