Merged latest changes
Closes #1