Updated to much cleaner, easier to use API
Added learning outcomes with correct priorities
Merge branch 'master' into proxy