Pull Request - Issue raptor 5

https://github.com/Tradesparq/raptor/issues/5#event-187260781