3
Merge pull request #13 from hussfelt/development

{"commit_message"=>"Merging for v1.1 release"}