Merge pull request #9 from andrie/master

Pull changes in Andrie's fork