Version3

Fixes #18 
Fixes #17 
Fixes #16 
Fixes #11