Merge pull request #1 from teleject/master

rebase