Ready for GitHub
Merged master fixed conflict