Changes for v0.2.5

Some of those commits based on #177

r ----> @aesedepece @aarizkuren