Feature one

Adding to master origin my merging handled