Change #4 by Ales Kot and Morgan Jeske

Change #4 by Ales Kot and Morgan Jeske