clean up the monster if-clause (still a monster but a bit more readable, now)
bump up version to v0.0.8