version 2.0.4
Merge pull request #1 from rore/master

Version 2.0.4