Merge pull request #63 from txomon/fix/arch-master-config

Fix/arch master config