Another fix to #14
Merge branch 'staging' of github.com:Orasi/blue-source into staging