jurrr Merge pull request #16 from jurrr/master