Fixed some bugs - Angel
Merge branch 'Development' of https://github.com/kalemdzievski/NLB into Development