Merge pull request #18 from AlexandreBeaulne/unstable

Reverting changes I introduced in Pull Request #15