Merge pull request #24 from BlueText/master

Sync with upstream
Merge pull request #25 from BlueText/master

Pull from upstream
Super awesome bug fix
Merge pull request #60 from aguibert/master

Super awesome bug fix