Europar2013

merge with numpy for tests