adding in bug for Issue #16
Merge branch 'master' into parse-extends-declaration
Merge branch 'master' into traits-parsing