Development into master (v0.3)

@CyberSecutor @noesnaterse