fixed conditional which was always true
Merge branch 'mariusa-master'
removed redundant call to makeRequest
1.3.1