Merge pull request #14 from JoomJunk/development

Update to 1.3.1
Merge remote-tracking branch 'upstream/master'