Version 0.7.3
Merge remote-tracking branch 'origin/master'
Exides PR and small bug fixes from me