Merged with oaeproject/Hilary + Travis integration + fixed merge conflicts