initial version
Merge GitHub - MVAS/master