Merged everything to master

Master can be merged in to your repository now.