v.0.5

Changes according to Kris's email

https://mail.google.com/mail/u/0/?ui=2&view=btop&ver=1csrg80ohzm1w&search=inbox&th=146faa9422670b11&cvid=1