Mydevelop

Both #317 and #318 together with conflicts resolved.