Addes some changes
Merge branch 'master' of https://github.com/benj-zen/AlP-V