Build dev 67 | Merged code from #49