Added features to version 0.8.4