SMag Issue 17

@smagofcl 1