Fixed issues #8, #16 & #17; made data migration