Loading annotations with switch
conflicts resolved
solvedcommit
Merge pull request #7 from Zarph/master

asd