Fixes: #86 #428
Merged with master