Mer/Releases/0.17

testing's on it's way