Adding code for initial version 0.1