Version 0.18.0
Merge pull request #24 from laCour/master

Version 0.18.0