Issues #314 #316 #318 #319 #320 #326 Implemented