Issue 8 - Merge cancan changes into master