Issues #314 #316 #318 #319 #320 #326 Implemented
Merge pull request #334 from gitcac/issues-314-316-318-319-320-326

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