Fix, 12-03-2014
Merge pull request #32 from pglibay/master

Fix, 12-03-2014