initial version
Merged changes