Dev

Please merge all my code changes to master branch