#7 small changes
Merged master