Add functionality for multiple unit types
Merge pull request #2 from Pear0/master

Merge pull request #1 from achyutreddy24/master
Merge pull request #2 from achyutreddy24/master

Update again