added some logic, not tested or run, just for oli's eyes to roll over
Merge branch 'master' of github.com:krissi92/SweetApi