intial project version
Merge remote-tracking branch 'midterm/master'