initial commit
feature 2 merged with master