Dev unstable

AFP 2013-2 accepted