Merge yours & mine + bugfixes