Rebase #23

Hi,

Since #23 wasn't moving I took the original branch and rebased it on current master.
Can we get a published version soon ?