adasdsa
Merge pull request #31 from hussfelt/development

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