Ashkan: some minor changes
Merge branch 'master' of https://github.com/anikravesh/Mobiperf-Library.git