Rebase develop after PR #53 went to master 

Please let's make the contributions to the develop branch ;)