Add new Architectureoptions
Merge branch 'master' of http://github.com/Slaan/SE1