#64 Merged from dev