Merge pull request #18 from kaspar030/rebase