Merged mookd's branch