Coinfix
Merge fix
merged master into branch