2
Merge pull request #14 from hussfelt/development

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