My great contribution to this project
Merge branch 'flycker-master'