First pages commit
Merged with master and resolved conflicts
bug fixes