Merge pull request #11 from arcimboldo/master

Fix backward compatibility