Merge pull request #2 from ippon87/master

Merge Sveinn's IAA work
Merge remote-tracking branch 'upstream/master' into restructure